d/gbp.conf: Return to debian/master branch
authorSimon McVittie <smcv@debian.org>
Tue, 9 Jul 2019 16:56:21 +0000 (17:56 +0100)
committerSimon McVittie <smcv@debian.org>
Tue, 9 Jul 2019 19:09:38 +0000 (20:09 +0100)
debian/changelog
debian/gbp.conf

index 64c4b394a87f06cfc8cd049334aece895db8df8f..773e962a35decc5e5875ed3c254b478579eca1b5 100644 (file)
@@ -1,5 +1,6 @@
 ostree (2019.2-2) UNRELEASED; urgency=medium
 
+  * d/gbp.conf: Return to debian/master branch
   * d/salsa-ci.yml: Request standard CI on salsa.debian.org
     - Disable build-time tests with DEB_BUILD_OPTIONS=nocheck for now.
       They don't currently work in the salsa-ci infrastructure, but I
index eda2cdd29205bcb9b31f04cdb4cf72170ce5a892..2bda9c8b6ce83248eccd88c38c71fffb4f3df66b 100644 (file)
@@ -1,7 +1,7 @@
 [DEFAULT]
 pristine-tar = True
 compression = xz
-debian-branch = debian/experimental
+debian-branch = debian/master
 upstream-branch = upstream/latest
 patch-numbers = False
 upstream-vcs-tag = v%(version)s